Change prototype of machine_restart to void machine_restart(void).

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index e9d1d3103b5f0b5a00fab47b75a217b301ff7a75..9f30f4355ff024aef073339d79cce80ebe1a3b77 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -1486,7 +1486,7 @@ int __init construct_dom0(struct domain *d,
        return 0;
 }
 
-void machine_restart(char * __unused)
+void machine_restart(void)
 {
        console_start_sync();
        if (running_on_sim)

diff --git a/xen/arch/powerpc/domain.c b/xen/arch/powerpc/domain.c
index c0f78bf797685b11ed49bee6b0eb9726d7465dd0..214a257385025115abe058833224899112194628 100644 (file)
--- a/xen/arch/powerpc/domain.c
+++ b/xen/arch/powerpc/domain.c
@@ -119,7 +119,7 @@ void machine_halt(void)
     machine_fail(__func__);
 }
 
-void machine_restart(char * __unused)
+void machine_restart(void)
 {
     console_start_sync();
     printk("%s called\n", __func__);

diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index 5fbecc088ea92635c2d5bbffc230f2fc97269017..8bc658fa8348e0db6fe51df09450d9520eea0b13 100644 (file)
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -197,7 +197,7 @@ static void machine_real_restart(const unsigned char *code, unsigned length)
 
 #endif
 
-void machine_restart(char *cmd)
+void machine_restart(void)
 {
     int i;
 

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index e6e4d296ab137d8fc3390b0b4bc6bbeed02ceb80..f7756cd32486f15c8bee5af0a9a9abc4370b8716 100644 (file)
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -123,7 +123,7 @@ static void dump_registers(unsigned char key, struct cpu_user_regs *regs)
 static void halt_machine(unsigned char key, struct cpu_user_regs *regs)
 {
     printk("'%c' pressed -> rebooting machine\n", key);
-    machine_restart(NULL);
+    machine_restart();
 }
 
 static void cpuset_print(char *set, int size, cpumask_t mask)

diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c
index a994e14bfc8abd1ec6c3cfd7d6895000234bd0ec..a3d48bf899e9c91b98996c2e6c96adebb30023c0 100644 (file)
--- a/xen/common/shutdown.c
+++ b/xen/common/shutdown.c
@@ -24,7 +24,7 @@ static void maybe_reboot(void)
         printk("rebooting machine in 5 seconds.\n");
         watchdog_disable();
         mdelay(5000);
-        machine_restart(NULL);
+        machine_restart();
     }
 }
 
@@ -50,7 +50,7 @@ void dom0_shutdown(u8 reason)
     case SHUTDOWN_reboot:
     {
         printk("Domain 0 shutdown: rebooting machine.\n");
-        machine_restart(NULL);
+        machine_restart();
         break; /* not reached */
     }
 

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 1d88fc80783e6cb0d820bbd6067e5ccd892fb4ed..7d52a4c3ca864b511cbf06933ca26c97783994d3 100644 (file)
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -895,7 +895,7 @@ void panic(const char *fmt, ...)
     {
         watchdog_disable();
         mdelay(5000);
-        machine_restart(NULL);
+        machine_restart();
     }
 }
 

diff --git a/xen/include/xen/shutdown.h b/xen/include/xen/shutdown.h
index cfe20002d824a4c7c2b78e7b70107f3ce1092c89..3f6d0af8db33dd0d7e8423c9d6ae005d4ff1b963 100644 (file)
--- a/xen/include/xen/shutdown.h
+++ b/xen/include/xen/shutdown.h
@@ -6,7 +6,7 @@ extern int opt_noreboot;
 
 void dom0_shutdown(u8 reason);
 
-void machine_restart(char *cmd);
+void machine_restart(void);
 void machine_halt(void);
 void machine_power_off(void);